merge master

author Joakim Verona <joakim@verona.se>

Fri, 16 Jan 2015 21:29:10 +0000 (22:29 +0100)

committer Joakim Verona <joakim@verona.se>

Fri, 16 Jan 2015 21:29:10 +0000 (22:29 +0100)
author Joakim Verona <joakim@verona.se>
Fri, 16 Jan 2015 21:29:10 +0000 (22:29 +0100)
committer Joakim Verona <joakim@verona.se>
Fri, 16 Jan 2015 21:29:10 +0000 (22:29 +0100)
diff --cc configure.ac
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Fri, 16 Jan 2015 21:29:10 +0000 (22:29 +0100)
committer	Joakim Verona <joakim@verona.se>
	Fri, 16 Jan 2015 21:29:10 +0000 (22:29 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history